From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 13 May 2008 09:19:54 +0000 (+0100)
Subject: Fix guest boot if set empty cdrom in config file
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14215^2~16
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=8a588ca0618165e5d50deb96b9510df8e569d22d;p=xen.git

Fix guest boot if set empty cdrom in config file

This is because function "uname = config.get('uname', '')" returns '',
rather than None, if uname is not in config variable.

Signed-off-by: Xu Dongxiao <dongxiao.xu@intel.com>
---

diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py
index 6305a64ac7..82853d6fbf 100644
--- a/tools/python/xen/xend/server/blkif.py
+++ b/tools/python/xen/xend/server/blkif.py
@@ -47,7 +47,7 @@ class BlkifController(DevController):
         except ValueError:
             dev_type = "disk"
 
-        if uname is None:
+        if uname == '':
             if dev_type == 'cdrom':
                 (typ, params) = ("", "")
             else: